d241dfbd42fc433982ae5b98e0bde05c9b6f6ae9,platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java,DiffMarkup,createAction,#MergeOperations.Operation#number#,172

Before Change


  private RangeHighlighter createAction(final MergeOperations.Operation operation, int lineStartOffset) {
    if (operation == null) return null;
    RangeHighlighter highlighter =
      getMarkupModel().addRangeHighlighter(lineStartOffset, lineStartOffset,
                                           HighlighterLayer.ADDITIONAL_SYNTAX,
                                           new TextAttributes(null, null, null, null, Font.PLAIN),
                                           HighlighterTargetArea.LINES_IN_RANGE);

After Change



  @Nullable
  private RangeHighlighter createAction(@Nullable MergeOperations.Operation operation, int lineStartOffset) {
    MarkupModel markupModel = getMarkupModel();
    if (operation == null || markupModel == null) {
      return null;
    }
    RangeHighlighter highlighter = markupModel.addRangeHighlighter(lineStartOffset, lineStartOffset, HighlighterLayer.ADDITIONAL_SYNTAX,